Don't mess up the column header state if the button release event is

2004-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event):
	Don't mess up the column header state if the button release
	event is missed.  (#159640)

diff --git a/ChangeLog b/ChangeLog
index b9ce365296487eca2ba62012ca738c2978479f96..0bb43fb4159c542dd1e53eb91fd7ff9ff8f574c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
        * gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
        * docs/tools/widgets.h (enum): Add an ASIS widget size.
 
        * docs/tools/widgets.c (get_all_widgets): Add file chooser,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b9ce365296487eca2ba62012ca738c2978479f96..0bb43fb4159c542dd1e53eb91fd7ff9ff8f574c9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
        * gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
        * docs/tools/widgets.h (enum): Add an ASIS widget size.
 
        * docs/tools/widgets.c (get_all_widgets): Add file chooser,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b9ce365296487eca2ba62012ca738c2978479f96..0bb43fb4159c542dd1e53eb91fd7ff9ff8f574c9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
        * gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
        * docs/tools/widgets.h (enum): Add an ASIS widget size.
 
        * docs/tools/widgets.c (get_all_widgets): Add file chooser,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b9ce365296487eca2ba62012ca738c2978479f96..0bb43fb4159c542dd1e53eb91fd7ff9ff8f574c9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
 2004-12-07  Marco Pesenti Gritti  <marco@gnome.org>
 
        * gtk/gtkcellview.c: (gtk_cell_view_set_background_color):
@@ -11,6 +17,10 @@
 
 2004-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): 
+       Don't mess up the column header state if the button release
+       event is missed.  (#159640)
+
        * docs/tools/widgets.h (enum): Add an ASIS widget size.
 
        * docs/tools/widgets.c (get_all_widgets): Add file chooser,

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 268be23a163aef624474c0c763863d73d3f6f8c3..e2c5e1e4d2c14bbda983547bf5c11f7348c9e6a6 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1058,12 +1058,12 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
       gtk_widget_grab_focus (widget);
     }
 
-  if (event->type == GDK_BUTTON_RELEASE &&
-      column->maybe_reordered)
+  if (event->type == GDK_BUTTON_RELEASE ||
+      event->type == GDK_LEAVE_NOTIFY)
     column->maybe_reordered = FALSE;
-
+  
   if (event->type == GDK_MOTION_NOTIFY &&
-      (column->maybe_reordered) &&
+      column->maybe_reordered &&
       (gtk_drag_check_threshold (widget,
                                 column->drag_x,
                                 column->drag_y,